Fixes widget focus issues
Cleans up types used