Issue - 171 - Front-end code improvement.
Merge pull request #275 from john29917958/john-patch-optimization

Issue - 171 - Front-end code improvement.