Massive update to UI and other smaller changes