Finished combined edit dialog gui updates