Updated to add waits for controls to become visible.