changed nav color
fixed conflicts