Updated app skeleton