Tweaked the UI to make it cleaner

+ cleanup of code