Some front-end fixes
Merge pull request #53 from newton10471/master

Some front-end fixes