Initial work on preview section
Merge kyledrake changes