fix bug in manifest and layout