Fix for Improvement and Lump
Merge pull request #13 from zeroghj/NewLayout

Fix for Improvement and Lump