Merge pull request #4 from ikar2000/dev

Dev
Merge pull request #8 from ikar2000/master

UI Changes