Refactor templates and give views similar look