rearranged some buttons