Now Viewing improvements

Fixes #300.