Changed variable-names, added action-listeners