Issue 116 - Front-end code improvement.