New Layout Fix

Fix #03