Tom fixes
Merge pull request #101 from CodePath-MAF/style_flip

Tom fixes