Fix for option header and footer