Changed order clause so newest is at the top
Fixed overlapping