More ui work
Merge branch 'master' of https://github.com/bladecoder/story-maker.git