Add header to sandwich page and some other tweaks