Remove selector, use buttons