bookmarks cleaned optimized and bugs fixed
merge conflicts