Major cleanup !
Cleanup in the html, changed the names of views, and refactored. All should be working as before the refactor now.

Tried out some directives. Not working as intended yet.