Master Layout Fixes