Updated authentication system and changed some layouts