styles and sorting fixes