fix client layout and add supported keywords list