UI edits and code refactoring.