Re-arrange controls