Some small changes in UI