Rohit refactored stuff to be more like widget, some hardcoding left to be removed