Clean up default layout