Login & menu restructuring