Refactoring templates and added some CSS.