Some changes to UI and Controllers