Fixed: Broke up the Bookmarks rendering code to be more efficient