few changes to labels (order of view/available data)
fixes of list from the database (reordering)