Some work towards fixing header issue on rotation