moved listeners to separate class added menu icon