fixed overlapping items
fixed things