Move buttons into a table