performance and large layout tweaks