Updated UI in prep for test framework.