header organise and delete after accept state

header organise and delete after accept state