refactor(views): Clean up views. Fix various bugs. Rename templates/views