frontend-fixups
Merge pull request #13 from chenhoward/front-end-changes

frontend-fixups