Some improvements in UI
Removed debugging alerts