Small refactory of the UI