Trying to improve on the look and feel

UI updates