Finishing touches to the UI changes (hopefully)