new modal selector
style updates
resolve conflicts