More "Ionic" styled
Change to API per Andy's ideas