Fixing errors in layout and css