some usability improvement