Brush up the UI and put in some logic