Multiple changes
- Simplify views
- Added templates and rendering util