Refactor key handlers add carousel factory