rearranged ui