removed debug output
Condensed all views into one template