Updated layout with additional labels