Enhanced ModifierContainer, little UI refactorings