fix sorting
fix modal overflow