Added daren share wish structure and some UI modification