Added more important declarations for layout widths.#2820