layout changes again

Made some more changes