Layout minor bug fixes