Layout changes to google nn