improved styling and added some sorting