Layout Fix

v0.2.37