rework layout of commit elements