* Add conflict code to Dialog/index.scss for simplicity. * A bit of cleanup on styles to make them more robust.
