Add views and update templates