More tweaks to get Now on view working