Some changes to the ui