Rearranged buttons, removed drawing controls