Improvements to the layout / CSS