Melissa/settings

Might want to set a trailing in case the text changes