Refactor: Fine tune ui.