navbar updated, waiting for less optimization