New Layout Fix

Fix #01