Updated app and resolved issues