some updates into layouts