Added more to basic layout