Partial work on fixing #463.

It works for the library and the downloads, but not during reading.
Merge branch 'master' into issue_463
Improved handling of the back button.