Layout design, be more charming.

Signed-off-by: Huei-Horng Yo <hiroshiyui@gmail.com>