Fixed previous commit
Basic layout for the ordering