updated layout again final