Frontend template cleanup