Fix some bugs, Layout improvement, add QDialogBoxButton