firefox fixes and better organized files for demo