Move button click UC to separate file