Update UI in prep for 9150 support

Update UI in prep for 9150 support