working on the layout

Signed-off-by: Simon <sijmon2003@gmail.com>