Some code refactoring and minor UI changes