Moved main and re arenged login