Beautify & fixed the order system