Layout and stylistic improvements