Enhance Modal look and function