modified viewes and user model
Merge pull request #13 from Jamanius/app_setup

modified viewes and user model