Clean up buttons. These will work for now.