added batch navigation and add/remove