Various Fixes for Theme CMS - mostly styling and wording