Changing the state and position of navigation buttons to improve UX

I think that this disposition of the elements is more intuitive than the current one. I'll be happy If you can take a look to it, and evaluate if it can be merged.