Rearrange header elements; align with changes to Bootstrap extension

Change-Id: Ie6aac4668d9b7335e8f912dee978d6520703c12c