Some fixes in UI
Fix after merge