Issue 171 - Front-end code improvement.