Merge pull request #6 from drcapulet/master

UI Changes & Blacklist