Fixed design issue