buttload of SPI views cleaned up and ported