work-in-progress
add nav css settings
merge upstream