Resolved Github Issue

Resolved #252
Merge pull request #264 from CTDisasterManagement/V5.8

V5.8- Resolved Github Issue
#252 use focus/blur
beautify code
turn highlight off