Better styling of tree
Unit tests for scenario controller
Merge remote-tracking branch 'origin/master'