Code and layout changes