Updatd button click signals and added context menu