Update toolbar and fix bad html rendering