Mapped out some new views

Now lets see if we can avoid breaking them again. XD