Removed template code. Simplified views.