Using template inheritance
Restructured the views a bit.