layout changes and margins fixed