Changed file structure
Made onClick have a wild card