[PATCH] Reorganize the right side of the Custom spoke (#1094856)