layout tweaks and corrections begun