More improvements, bug fixes and toolbar functions