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

Issue 171 - Front-end code improvement.