Updated layout and security package