made some design improvements