Layout, button css, and line/bar plot behavior
Merge remote-tracking branch 'origin/devel'