- Move modal styling to variables

and cleanup whitespace
- Modal footer styling
- Modal styling

and whitespace cleanup
Merge branch 'feature-ns-modal-changes' into develop