Fix rollover effect, cleanup rollover code (#126)