fix the overlap button and remove some warnings in xml