Fixed minor bugs relating to view transitions on watch