Front-end performance tweaks