Some improvements & fixes
Some fixes in UI & logic