Marionette refactoring

Start working on removing rows from Punctuation, case wizard pages (not
done).