Frontend fixes
Template fix