Added toolbar and undo/redo buttons