Cleanup and reorganization of button

Moved button (local gits may be out of sync, so check for last check-in)