Cleaned up and added full function to Item tab