Minor changes to header and footer base on new button changes