Views merge controllers

Adding views and controller logic