merged for github.io changes to show app