Rebuilt
Improved visual presentation, removed multiple-handler functionality