Add buttons to toolbar and fix dragging, new show/hide feature