front end related changes
Merge pull request #2 from gridi/master

front end related changes