Fixed sorting and implemented side panels