Made changes to layout and user login