#143: Moved mouse handlers to navigator handlers and changed name of keyboard handlers