Slightly modified the layout
Generate a new key at startup