Layout tweaks, added API usage
Fix gray mispeled and minor changes