Rearranged the layout for more fluidity

Rearranged the layout so there is more of a flow