CSS and Layout Fix

In Progress