Header redesign
Fix amend bug