Fixed some organization issues in items.xml