Organized sapces in ItemsUP
Well, removed a few bugs something like #3