- Fix edit Active status
- Fix Coding Style