code cleanup modal prev/next
merge