More verbose error
Refactor widgets into actual classes