Layout changes for API part.