Tweaked the interface to look a little cleaner