final beta commits... remove button working...