Updates to clean up initial interface