Moved user actions into navigation