Updates to frontend and backend templates