Changed UI and fixed location API errors