Added return Button for all pages + Crash issue

Small performance update with the crash too. I don't think any other
page needs the return button but it's easy to implement now.