Reorganizing templates and adding css