Mouse visibility & refactoring