Move buttons rebase

Rebase of move buttons onto current master