corrected views structure, added templates