Layout and style tweaks...