Fix for F - Header Buttons