fix rect bug, add Button control