Bookmark UI fixes