added buttons to views and implements homes page
fixing merge conflicts