Tweaks.
Merge branch 'flat-ui' of https://github.com/alexhsamuel/supdoc into flat-ui