fixing design comments