Add layout and improve login feedback