Issue 171 - Front-end code improvement.

This is a 5th. pull-request for #171.