Improved frontend and backend templates