Layout and CSS improvements