Added bookmarklet support, removed history for now, small refactoring