Refactoring, minor UI changes