fixes for PR feedback on Studio Pages