[fix] move controls outside wrapper