White ground and improve nav