Moving views over to base.make, updating to 3.6.