minor UI changes, changes to login logic in controller
merge
merging