Overall design improvements