Fix bugs of Submissions and change some design