Add remove billboard and change billboard functionality