ripples working
fix outer border of modal box
complete formatting of modal text box, button
slight tweak
Fix merge conflicts
Merge branch 'modal_styling' into development