Layout is much more solid now