Update to modern layout