Fix spacing
Change the option triggering logic