Toggle widget revamped