Refactoring complete, adding more cow bell

More functionality has been added in more V1 related widgets