working on layout and security a bit