Added classes needed for new layouts.