Added main views and angular controllers