Look and feel changes and added login back to activitylog
Merge branch 'master' into USC
Look and feel changes