Numerous updates to UI and UX