Few layout changes..