Refactored structure, improved image locator, icons, connected with API server