Dispatch: Modified changes of popup's and new button functionalities added