Frontend template markup simplification and cleanup