Details popup implemented
Refactoring