Fix the layout and css spacings