multiple tweaks to new layout