Login features
Merged changes after pull
Fixes after merge