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

Issue 171 - Front-end code improvement.