fixing design, two little enhancements