Design system improvement

shape