Both map views now working