some misc changes in layout

Signed-off-by: Liew Zhao Wei <zhaoweiliew@gmail.com>