UI improvements

This also adds the missing “removeObserver:” call.