addes more mouseovers
Merge origin/master