Moving buttons around. Again.