move methods, fix nav