FINAL VERSION

UI Bug fixed.
Final testing.
-still need to add some security elements