Adopt IONICO and UI improvements