Restructured veiws to allow for partial (modal) views as well as JSON views in the future.