Kevin swipe composer fix

Merged with thibultizanini codes
@kevinluosl the indentation doesn't look right