Layout and Styles update