Updated layout to include header navbar