Sorting fix and demo styles