Follow view-mode. Minor cleanups