Layout Fixes

Many new layouts added