Security changes and layout changes