Major Ui changes and updates