Layout tweaks per #59