Some nice improvements to the console layout functionality and a couple of other smaller improvements