Polish updated style.
Fixed bug with labels
Merge pull request #98 from trestle-pm/dev/style_update