added controller and navigation concepts/editors