Final layout fix