Added design chafes and numerous fix