Added views, modified controller