hm, layout plus further tweaks