Updated app and layout views.