(WCM-274) Adjusted buttons ordering