Changed presentaiton layout, added security