Moving more to view files.