Bug fixes and added confirmation dialog to bookmark