fixed bookmarks, cleanup UI