Fixed the design issue