diff --git a/app/assets/javascripts/app/views/aspects_dropdown_view.js b/app/assets/javascripts/app/views/aspects_dropdown_view.js
index 9aba29907..e02fed8ef 100644
--- a/app/assets/javascripts/app/views/aspects_dropdown_view.js
+++ b/app/assets/javascripts/app/views/aspects_dropdown_view.js
@@ -5,7 +5,7 @@ app.views.AspectsDropdown = app.views.Base.extend({
   },
 
   postRenderTemplate : function(){
-    this.setVisibility({target : this.$("a[data-visibility='all-aspects']").first()})
+    this.setVisibility({target : this.$("a[data-visibility='public']").first()})
   },
 
   setVisibility : function(evt){
diff --git a/features/step_definitions/trumpeter_steps.rb b/features/step_definitions/trumpeter_steps.rb
index cfa97380c..37e07b7b4 100644
--- a/features/step_definitions/trumpeter_steps.rb
+++ b/features/step_definitions/trumpeter_steps.rb
@@ -122,7 +122,7 @@ When /^I select the mood "([^"]*)"$/ do |mood|
   click_link mood
 end
 
-Then /^the post's mood should (?:still |)be "([^"]*)"$/ do |mood|
+Then /^the post's (?:default |)mood should (?:still |)be "([^"]*)"$/ do |mood|
   assert_post_renders_with(mood)
 end
 
diff --git a/features/trumpeter.feature b/features/trumpeter.feature
index 81cb9e9db..3eb8645ab 100644
--- a/features/trumpeter.feature
+++ b/features/trumpeter.feature
@@ -47,10 +47,11 @@ Feature: Creating a new post
     And I upload a fixture picture with filename "button.gif"
 
     And I start the framing process
+    #defaults to the prettiest mood
+    Then the post's default mood should be "Wallpaper"
+    Then it should be a wallpaper frame with the background "button.gif"
     Then I should see "This is hella customized" in the framer preview
-  #### Will test the template picker being ported to JS ####
-  # Then the default mood for the post should be "Wallpaper"
-  # And I should see the image "button.gif" background
+    #changing the mood changes the presentation
     When I select the mood "Day"
     Then the post's mood should be "Day"
     And "button.gif" should be in the post's picture viewer
diff --git a/spec/javascripts/app/views/aspects_dropdown_view_spec.js b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
index 8ecb746c8..c8b649240 100644
--- a/spec/javascripts/app/views/aspects_dropdown_view_spec.js
+++ b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
@@ -16,9 +16,9 @@ describe("app.views.AspectsDropdown", function(){
       this.view.render()
     })
 
-    it("defaults to All Aspects Visibility", function(){
-      expect(this.view.$("input.aspect_ids").val()).toBe("all_aspects")
-      expect($.trim(this.view.$(".dropdown-toggle .text").text())).toBe("All Aspects")
+    it("defaults to Public Visibility", function(){
+      expect(this.view.$("input.aspect_ids").val()).toBe("public")
+      expect($.trim(this.view.$(".dropdown-toggle .text").text())).toBe("Public")
     })
 
     describe("selecting Public", function(){