Proposed Fixes for Layering!

Bottom half.