Added css changes as well as other layout changes