Cleaned up some errors
Moved Twig templates to use inheritance