Mircea: Added modal for more info plus refactorings