Making some major changes in the UI