add icons;
fine tune the xml for better user experience;