fix sorting and some css changes