Added pagination, Dropdown bug fix