Fix to expose header and footer views