Fixed up views more and maps