Tmyrden/views

Merge me!