Dependency cleanup, edit favorites button, patrol instructions