Added bookmarks tab to layout, more optimizations