Rearranged the views