Added design improvements