more layout and login fixes