Work done on authentication system
Fixed merge conflicts
Work done on ui and authentication