Issue #23, #34: visual design was enhanced