New Layout Fix

Fix #05