-Fix duplicate string concatentation
-Condense all events into one
-Simplify naming
Widen modal