Updated extra layout more