Frontend admin tweaks, cleanup