Many Editor-Improvements
Many Editor-Improvements