fixed sl-tp issue and margin