template added, views structure redefined