Fixed issues in the online demo milestone

fixes #59
fixes #117