Small UI refactoring