Update to basic layout