ui navigation cleanup