add buttons and integrate andy edit recommendations done by me and jessica, fixes #9, #8, #7