Merge from JiMin

This include setting dialogs