rearranged some ui items