Update theme layout and css