[P3]Some more layout tweaks.