navigation moved to partial and minor fixes