This setup for the UI makes a little more sense