reorganised navbar