Spring upgraded to 3.2.5 + some minor view fixes