improvements on .navigation to default theme