fixed the design issue