Improved UI and user entered API key field