Front end performance tweaks