Modified some issues with settings. Made login neater