Moved some buttons around