Improve UI and ViewModification components.