Cleaned up more stuff
Fixed a few residual bugs with merging settings and setting the display panels in the demo app pane