New unique map header names
Sperated out headers and buttons
Final versions