Change back items to controllers

Need review from other :D