Worked on master layout and authentication