updated TODO
support for toggling toolbar
updated TODO