More cleanup and refactoring, default widgets, etc..