Some beautifications in S/R dialog