Some tweaks to layout, and added a temporary scheme hack.