Added more styling and sorting elements