Merge pull request #43 from SupunS/master

UI modified
clean up, rm some unnecessary jag files