Fix the dialog to holoeverywhere
Clean up