some fixes, added sort icon