More style fixes to make presentation match edit mode