Layout rewritten from scratch