made changes to apps

pull refactor changes into gh-pages