Resolved some issues of usability