Fix a problem in Item list;
Other little modifications.