update layout

Signed-off-by: Micky Ching <mickyching@gmail.com>
update tags

Signed-off-by: Micky Ching <mickyching@gmail.com>