RemoveBtn and Settings bugs fixed