New: move buttons (temporary, for development)
Fix: move buttons