Minor tweaks - ui and api key related