Work on subject viewer
Make drawing tools work again