Changes with final layout changes