buttons rearranged