Slight refactoring
Improve results display, add detailed view