fixing some issues in UI