Revert "Revert "Mircea: Added modal for more info plus refactorings""

This reverts commit b867b97177de800770f4c040be58aea25a109fdc.