Fix jankiness with back button. Closes #61.