fixed navigation issue thing
uncommitted with previous