Finishing up major demo UI overhaul to bring design more in line with storyboard. Fixes #19