Sorter fix, new font, forms added