Added toggle buttons and option page