Organized Imports
Added on click event