More clarifaction and neatness in gui