Removes some hard coded texts and fixes bug