basic layout updated