Nested the stack and note resources and converted the views over