Cleaning up and unifying UI.