Merge pull request #225 from alanjoyce/dart-1

Bundle of design/style fixes