fixing layout some more