Rearranged the UI