Refactored some views.

It was necessary to change spec because of the new route introduced.
Improved ui buttons