combine separate onClicks into one, and rename some files