Initial cleanup and addition of view 3 partial