Removed header fields from backend and re-ordered template