Fixes for switching widgets