added addition edit/save buttons and scroll to fixed side bar
merge commit