some refactoring -- decoupled the indicator and bookmarks, now event-based interactions only...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>