Updated app-base template