Refactor view code

- Converted the various modules into directives
Code cleanup + lunch partial