Tweaks to frontend cms stuff