Changed the flow of the views