added some code for a bit better view and sorting;