Minor code refactoring and UI updates