added close ("X") icon --- simplified overall and function names