Updated to <!--comment--> format for bookmarks and top icons