fix double context in outline view
cosmetic restructuring