Refactored items into items and menuitems