Layout rewritten from scratch + more