Restructure the items controller
( few minor bug fixes on that page )