Refactored solution editor