Finish formatting and layout

Looking at changing CSS