Finalizing UI changes