Feature/reorder nav