Fix user interface problem
Minor modifications