Merge pull request #5 from jawwad/master

Fix instances of spaces in class names starting with the UI prefix