Improve menu + login page