Update layout struture. Add title tags