Tweaked a few of the interface components