Now viewing improvements

Fixes #300.