changes in UI, Bug fix