Update layout and add settings
Update layout