Bookmark tool updated, MainWindow Updated

All updated so that bookmark tool is selectable et al.