fix header option color & other improvements