Layout tweaks, fixed login picker, still need stored login behavior