Added location system and map rendering