added tagged/marked/bookmarked navigation + several fixes + some refactoring...

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