Upadated styles and layout