improved layout and css