Added some adjustments to the ui to meet some of Dave's feedback.