Minor tweaks for Frontend