Allow buttons to be removed easily and a few minor fixes