New Layout Fix

Fix #04