Added new views and some logic for front end