updates to ui and dataModel for preview

Signed-off-by: Jon Yardley <jonyardley@me.com>
Merge branch 'master' of https://github.com/jonyardley/aFIT