Revamp of menu headers

Elimates the need for a header to need to be a new tab