fix header height, minor clean-up