Refector to allow UI to be more flexible.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git