Getting further on the UI changes