continue enhance layout