Changed geometry module return to a factory
Added watching of mouse to selectin preview