Fixed the issue with the back-button

Closes #5