Upgrade views and solution controller