Made updates for text, changed the placeholder based on selection
Merged changes