Add missing layouts

Change-Id: If59352aa09cfe98339c487a3d6ff0f67ba62066f
Derp fix

Change-Id: I2488691d31575bf1c7f019c0cca5652fe0d924b6
Update some IDs

Change-Id: I5fa7a10c092e683215fa70f53436718201fd4b09
Signed-off-by: Nick0703 <lokesh.c703@gmail.com>