made minor change to adding and removing clickables.