Re-arrange buttons