More button changes (mainly header related)