Tune up for Usability improvement