Improved UI. Removed debug code.