Layout tweaks, further annotations