Add Navigator, add/refactor Commands