Refactored out more widgets