Updated layout some more