Fixed some controller stuff and added JSON populated data.