Improved design and fix mouseout bug