Layout and HTML improvements