Better learning data + fix dashboard ordering