Moved click handlers back into activity from fragment