Changed design + login functionality