Final layout and style tweaks