User View + Controller

* Cleanup code
* Minor fixes
* Modified HTML
* Moved variables from View to Controller

See diff & comments