New layout implementation