UI changes and test adjustments