Get new layout mostly working. More work shifting over to new
restangular based service.