X on mouseover

Fixed #147 and Fixed #101