Done major redesign and fix some security issues