Simplified the on click stuff