Adding Command, refactoring click listeners into commands