navigation styling changes
fixed merge conflict