Simplify handling of changes
UI improvements