A few front-end related tweaks