Layout fixes + getting the right window