Added table border and sorting