Stop using nested layouts