Fixed some design problems