updates to layout
Merge branch 'master' of github.com:DanielBaird/CliMAS-Next-Generation