Layout and css updates