Added enough changes to test app UI to make it public, although it is not totally finished