Modal dialog final and minor pagination edits