Added user authentication
Rearranged some pages