Changed shipping options to use events
Fix column issue