Started the Foundation switch.
Coverted a couple of views.
Fixed test warning.