Improve modal design