Rearranged the layout