Cleaned up the hover feature
Removed completed features from TODO