minor edits
doing some refactoring
refactored modals into a more generic class
minor edits