Some refactoring and UI improvements