finishes up code migrations and fixes new Options Layout