layout tweaks and adjustments