Improve modal ui & change sysStory format