Moved mouse-mode specific features to correct places