Fixed icon issue
Removed too many widgets from JQuery UI (buttonset is used)