Laid out page
Merge branch 'master' of github.com:jenshen/edx-analytics