Reworking some dialog layouts