Conform to styleguide better, dark UI expecially
Merge pull request #4 from D-side/styleguide-tuning

Conform to styleguide better, dark UI expecially