Fixed Item Data display
Merge branch 'master' of https://github.com/leonwlaw/TeamRubiconFTW
Final cleanup