More grid layout and cleanup, login fixes