Minor code cleanup
Items now use a different hover setup