Fixes #32: Readjust design [trigger:composer]