Nav styling, c5 conflict fixes