Updated: added header layout to basecontroller