2.1 Views

Continuing the finishing touches on the views.