Issue 116 - Front-end code improvement.
Merge pull request #117 from john29917958/john-patch-code-improvement

Issue 116 - Front-end code improvement.