Fixed properties and remove the hardcoded text