begin replacing confirm w/ 'really remove' flow
really mirror master & sensible button locations
Merge pull request #519 from keyvanfatehi/515_really_mirror_master

515 really mirror master