bookmarks half implemented
some logic stuff fixed
reordered some of the UI