Pattern Layout & Big Fixes