Fix minor design bugs