Various chargen tweaks
Merge remote-tracking branch 'lazaroth/layout_updates_4'