master -fixed switch widget bugs