Restored usage of User model; Cleanup
Changed theme
Cleanup