refactored tables and added bookmark removal