Fixed some design issue