Updated with comments
Improved gtk viewer