added some buttons on index page
Fixed merge conflicts