Started working on views and controllers