Fix errors in layout