UI changes and testing...