Design changes and add two buttons
Add Debug Log
Change Debug Log
Resolve addition bug
Fix 'if' statement-Add TODOs