Merge pull request #28 from exfm/dan-dev

Dan dev
export page; updated options page to reflect export page styles
Merge pull request #30 from exfm/maj-dev

export page; updated options page to reflect export page styles
Merge branch 'dev' into dan-dev