Seperate and modified the widget to handle most of the functionality.