Merge pull request #33 from AceMNT/develop

Merged from develop
Merge pull request #35 from AceMNT/develop

Fixed UI