Continue updating variable names and make the login form fit into the design