new UI v1.1 (menu fixed, tidy up)
Merge pull request #88 from mehere/dev

Pull Request from dev -> dev-wee on 7/3