* Added possibility to arrange entries