Hid a bit more stuff to not confuse the user
Better workflow for fixing clashing changes
Support for dismissing changes