Added modality and UI refinements