Minor changes
Fixed Login Issue
Fixed major issues