Added custom bubble dialog and cleaned up some imports