Added correct layout