Modified layout to work with more names!