Moved some sections to views.