Improved Scheme Layout