[WIP] Order component & fixes