Mastheadbutton refactor, progress commit