More layout, etc. tweaks.