LPS-42812 UI Fix - Update the items order, move the empty zones.