Change input class again, add listener class for finer handling of events