Manually merging Jordan's branch to master.  Added styles for study page. [axof: 206]