Updated composer layout