finished filtering and rearranged ui