Cleaning up Bootstrap
Adding auditing and security