Revert a bunch of stuff to relocate buttons

Allows more permissions this way.