Layout and CSS update