Layout (mostly) done; minor tweaks to methods