New layout

new layout and security fixes