updates: improved compose form