Layout tweaks, added cap