Additional layout changes to Google NN