Now I really finished the layout