fixed more stuff
Merge pull request #12 from rocketu/frontend

fixed more stuff