changed layout; added elements