Some changes to the UI`