Refactored editor xaml