updating features from overriden state
updated nav background-color
updated nav bg color
Merge branch 'test' into prod