Merge pull request #24 from codescrapper/newui

newui