Modal composer layout improvements