View fixes

* Back button works
* Close buttons stop the app correctly