Some final modifications to WUI and CLI
Merge branch 'master' of https://github.com/francoisfreitag/ui-design