Add move buttons, misc improvements