Improved UI, removed alerts