More progress on UI elements.