More async, scale edit controls so buttons auto size