lergo-107 : front end changes
Merge pull request #60 from lergo/lergo-107

Lergo 107 front end changes