Tested & Redesign

-Tested features, ready for using
-refactored code