look and feel issue #19 issue #20