made front-end changes per a/w feedback